Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <[email protected]>
Sat, 17 Jul 2010 18:49:59 +0000 (20:49 +0200)
committerWolfgang Denk <[email protected]>
Sat, 17 Jul 2010 19:36:00 +0000 (21:36 +0200)

Trivial merge